Skip to content

Ensure stack when type checking and building MIR for large if expressions #74708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jul 27, 2020
Merged

Ensure stack when type checking and building MIR for large if expressions #74708

merged 2 commits into from
Jul 27, 2020

Conversation

kanru
Copy link
Contributor

@kanru kanru commented Jul 24, 2020

Fixes #74564

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @davidtwco (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 24, 2020
davidtwco
davidtwco approved these changes Jul 24, 2020
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 24, 2020

📌 Commit f64e58c has been approved by davidtwco

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jul 24, 2020
@Dylan-DPC
Rollup merge of rust-lang#74708 - kanru:issue-74564, r=davidtwco
bc36d69 
Ensure stack when type checking and building MIR for large if expressions

Fixes rust-lang#74564
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jul 24, 2020
Closed
@mati865
Copy link
Member

mati865 commented Jul 24, 2020

Is is safe for rollups, perf wise?

@davidtwco
Copy link
Member

Is is safe for rollups, perf wise?

I'm not sure, I'd assume so?

@mati865
Copy link
Member

mati865 commented Jul 24, 2020

Docs are not that convincing 😅:

Should not be sprinkled around carelessly, as it causes a little bit of overhead.

@JohnTitor
Copy link
Member

Failed in rollup: #74719 (comment)
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 24, 2020
@kanru
Copy link
Contributor Author

kanru commented Jul 25, 2020

Hmm, the test passed locally on my machine. I wonder what makes the rollup to fail 🤔

@JohnTitor
Copy link
Member

@kanru I can reproduce the failure on my local, you should rebase.

@kanru
Copy link
Contributor Author

kanru commented Jul 25, 2020

@kanru I can reproduce the failure on my local, you should rebase.

I can reproduce with stage 2. Investigating...

@kanru kanru requested a review from davidtwco July 25, 2020 14:58
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 26, 2020

📌 Commit 0e2ec8c has been approved by davidtwco

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 26, 2020
@davidtwco
Copy link
Member

@bors rollup=never (in case there is a perf impact)

@bors
Copy link
Collaborator

bors commented Jul 26, 2020

⌛ Testing commit 0e2ec8c with merge c709862...

@bors
Copy link
Collaborator

bors commented Jul 27, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: davidtwco
Pushing c709862 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 27, 2020
@bors bors merged commit c709862 into rust-lang:master Jul 27, 2020
@tesuji tesuji mentioned this pull request Jul 27, 2020
Closed
@lqd lqd mentioned this pull request Jun 14, 2022
Closed
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
cuviper added a commit to cuviper/rust that referenced this pull request Aug 14, 2025
@cuviper
rustc_expand: ensure stack in InvocationCollector::visit_expr
f68bcb3 
In Fedora, when we built rustc with PGO on ppc64le, we started failing
the test `issue-74564-if-expr-stack-overflow.rs`. This could also be
reproduced on other arches by setting a smaller `RUST_MIN_STACK`, so
it's probably just unlucky that ppc64le PGO created a large stack frame
somewhere in this recursion path. Adding an `ensure_sufficient_stack`
solves the stack overflow.

Historically, that test and its fix were added in rust-lang#74708,
which was also an `ensure_sufficient_stack` in this area of code at the
time. However, the refactor in rust-lang#92573 basically left that
to the general `MutVisitor`, and then rust-lang#142240 removed even
that ensure call. It may be luck that our tier-1 tested targets did not
regress the original issue across those refactors.
@cuviper cuviper mentioned this pull request Aug 14, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.

Stack overflow in rustc, regression from 1.44
7 participants
@kanru @rust-highfive @davidtwco @bors @mati865 @JohnTitor @cuviper